Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 2 Jun 2011 08:25:28 +0000 (01:25 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 2 Jun 2011 08:25:28 +0000 (01:25 -0700)
commit34ad810fa693752e47d3346ab4d32939d9cd0f35
tree7b25effb420b0e855b2ce32e58346bc3b9488f69
parent1483cefd733b742d6d146dbdbcd73cc50c952cc7
parenteab6a1f67071a10139e2bd6a89dbe3c8b40ab053
Merge from trunk.
ChangeLog
src/ChangeLog
src/alloc.c
src/lisp.h
src/minibuf.c